diff --git a/system/core/Loader.php b/system/core/Loader.php
index 9169a12..c884df1 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -271,7 +271,7 @@
 				$db_conn = '';
 			}
 
-			$CI->load->database($db_conn, FALSE, TRUE);
+			$this->database($db_conn, FALSE, TRUE);
 		}
 
 		if ( ! class_exists('CI_Model', FALSE))
@@ -623,12 +623,12 @@
 	 */
 	public function language($files, $lang = '')
 	{
-		$CI =& get_instance();
+		$LNG =& get_instance()->lang;
 		is_array($files) OR $files = array($files);
 
 		foreach ($files as $langfile)
 		{
-			$CI->lang->load($langfile, $lang);
+			$LNG->load($langfile, $lang);
 		}
 
 		return $this;